Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 27 May 2010 11:59:21 +0000 (11:59 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 27 May 2010 11:59:21 +0000 (11:59 +0000)
commit83768caa87acab160b218bc4d9cb55ea447652e9
treee7daa8b191c9115dc2f4d16530a5e3b58f37db51
parent73e0ce9996a8e4742c287413c77f43b3a4f43a3f
parent0d42f24933d223996ae902cd4e1691c0c297cc92
Merge from mainline.